From aa4b616c673527e14e7729c571b37de35daee7bf Mon Sep 17 00:00:00 2001 From: "riel@redhat.com[kaf24]" Date: Sat, 5 Mar 2005 11:24:12 +0000 Subject: [PATCH] bitkeeper revision 1.1236.1.62 (422996dcaXWGIhR3ZzSlNz3XpvLF0A) [PATCH] [PATCH] gcc4isms part 2 This completes the gcc4ism changes to the Xen tree. All of the changes in this patch are in the tools/ subdirectory and are pretty simple. Some of the changes are for overly strict gcc4 warnings, but I guess it's still good to verify that the variable really wasn't unused, or that the sign change is really harmless. I guess I really do like -Werror now... Signed-off-by: Rik van Riel libxc/xc_linux_build.c | 2 +- libxc/xc_plan9_build.c | 24 ++++++++++++------------ libxc/xc_vmx_build.c | 2 +- python/xen/lowlevel/xu/xu.c | 2 +- xcs/xcs.c | 2 +- xfrd/lzi_stream.c | 2 +- xfrd/marshal.c | 4 ++-- xfrd/xdr.c | 2 +- xfrd/xfrd.c | 12 ++++++------ 9 files changed, 26 insertions(+), 26 deletions(-) --- tools/libxc/xc_linux_build.c | 2 +- tools/libxc/xc_plan9_build.c | 24 ++++++++++++------------ tools/libxc/xc_vmx_build.c | 2 +- tools/python/xen/lowlevel/xu/xu.c | 2 +- tools/xcs/xcs.c | 2 +- tools/xfrd/lzi_stream.c | 2 +- tools/xfrd/marshal.c | 4 ++-- tools/xfrd/xdr.c | 2 +- tools/xfrd/xfrd.c | 12 ++++++------ 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c index 1db6cfe69d..2a41fa6b58 100644 --- a/tools/libxc/xc_linux_build.c +++ b/tools/libxc/xc_linux_build.c @@ -279,7 +279,7 @@ static int setup_guest(int xc_handle, start_info->mod_start = vinitrd_start; start_info->mod_len = initrd_len; } - strncpy(start_info->cmd_line, cmdline, MAX_CMDLINE); + strncpy((char *)start_info->cmd_line, cmdline, MAX_CMDLINE); start_info->cmd_line[MAX_CMDLINE-1] = '\0'; munmap(start_info, PAGE_SIZE); diff --git a/tools/libxc/xc_plan9_build.c b/tools/libxc/xc_plan9_build.c index 6466e17445..a7e37c13a5 100755 --- a/tools/libxc/xc_plan9_build.c +++ b/tools/libxc/xc_plan9_build.c @@ -81,14 +81,14 @@ void plan9header(Exec * header) { /* header is big-endian */ - swabby(&header->magic, "magic"); - swabby(&header->text, "text"); - swabby(&header->data, "data"); - swabby(&header->bss, "bss"); - swabby(&header->syms, "syms"); - swabby(&header->entry, "entry"); - swabby(&header->spsz, "spsz"); - swabby(&header->pcsz, "pcsz"); + swabby((unsigned long *)&header->magic, "magic"); + swabby((unsigned long *)&header->text, "text"); + swabby((unsigned long *)&header->data, "data"); + swabby((unsigned long *)&header->bss, "bss"); + swabby((unsigned long *)&header->syms, "syms"); + swabby((unsigned long *)&header->entry, "entry"); + swabby((unsigned long *)&header->spsz, "spsz"); + swabby((unsigned long *)&header->pcsz, "pcsz"); } @@ -132,8 +132,8 @@ setup_guest(int xc_handle, unsigned long ksize; mmu_t *mmu = NULL; int i; - unsigned long first_page_after_kernel, - first_data_page, + unsigned long first_page_after_kernel = 0, + first_data_page = 0, page_array_page; unsigned long cpu0pdb, cpu0pte, cpu0ptelast; unsigned long /*last_pfn, */ tot_pte_pages; @@ -358,7 +358,7 @@ setup_guest(int xc_handle, start_info->flags = 0; DPRINTF((" control event channel is %d\n", control_evtchn)); start_info->domain_controller_evtchn = control_evtchn; - strncpy(start_info->cmd_line, cmdline, MAX_CMDLINE); + strncpy((char *)start_info->cmd_line, cmdline, MAX_CMDLINE); start_info->cmd_line[MAX_CMDLINE - 1] = '\0'; munmap(start_info, PAGE_SIZE); @@ -407,7 +407,7 @@ xc_plan9_build(int xc_handle, unsigned int control_evtchn, unsigned long flags) { dom0_op_t launch_op, op; - unsigned long load_addr; + unsigned long load_addr = 0; long tot_pages; int kernel_fd = -1; gzFile kernel_gfd = NULL; diff --git a/tools/libxc/xc_vmx_build.c b/tools/libxc/xc_vmx_build.c index 2a7a9d016b..07017291ec 100644 --- a/tools/libxc/xc_vmx_build.c +++ b/tools/libxc/xc_vmx_build.c @@ -339,7 +339,7 @@ static int setup_guest(int xc_handle, page_array[(vboot_params_start-dsi.v_start)>>PAGE_SHIFT]); memset(boot_paramsp, 0, sizeof(*boot_paramsp)); - strncpy(boot_paramsp->cmd_line, cmdline, 0x800); + strncpy((char *)boot_paramsp->cmd_line, cmdline, 0x800); boot_paramsp->cmd_line[0x800-1] = '\0'; boot_paramsp->cmd_line_ptr = ((unsigned long) vboot_params_start) + offsetof(struct linux_boot_params, cmd_line); diff --git a/tools/python/xen/lowlevel/xu/xu.c b/tools/python/xen/lowlevel/xu/xu.c index 54f59dff04..6b435032a1 100644 --- a/tools/python/xen/lowlevel/xu/xu.c +++ b/tools/python/xen/lowlevel/xu/xu.c @@ -773,7 +773,7 @@ static PyObject *xu_message_get_payload(PyObject *self, PyObject *args) return dict; } - return PyString_FromStringAndSize(xum->msg.msg, xum->msg.length); + return PyString_FromStringAndSize((char *)xum->msg.msg, xum->msg.length); } static PyObject *xu_message_get_header(PyObject *self, PyObject *args) diff --git a/tools/xcs/xcs.c b/tools/xcs/xcs.c index 79342dc444..8539d20dfc 100644 --- a/tools/xcs/xcs.c +++ b/tools/xcs/xcs.c @@ -743,7 +743,7 @@ int main (int argc, char *argv[]) int size; memset (&remote_addr, 0, sizeof (remote_addr)); size = sizeof remote_addr; - ret = accept(listen_fd, (struct sockaddr *)&remote_addr, &size); + ret = accept(listen_fd, (struct sockaddr *)&remote_addr, (socklen_t *)&size); if ( ret < 0 ) { perror("accept()"); diff --git a/tools/xfrd/lzi_stream.c b/tools/xfrd/lzi_stream.c index 5fbec775c4..20644efad0 100644 --- a/tools/xfrd/lzi_stream.c +++ b/tools/xfrd/lzi_stream.c @@ -242,7 +242,7 @@ int read_block(LZIState *s){ int err = 0, k = 0; //dprintf(">\n"); if(s->eof) goto exit; - err = unmarshal_uint32(s->io, &k); + err = unmarshal_uint32(s->io, (unsigned int *)&k); if(err) goto exit; if(k > s->inbuf_size){ err = -EINVAL; diff --git a/tools/xfrd/marshal.c b/tools/xfrd/marshal.c index 21691d4412..21775b658b 100644 --- a/tools/xfrd/marshal.c +++ b/tools/xfrd/marshal.c @@ -166,7 +166,7 @@ int marshal_string(IOStream *io, char *s, uint32_t s_n){ int unmarshal_string(IOStream *io, char *s, uint32_t s_n){ int err = 0, val_n = 0; //dprintf(">\n"); - err = unmarshal_uint32(io, &val_n); + err = unmarshal_uint32(io, (unsigned int *)&val_n); if(err) goto exit; if(val_n >= s_n){ err = -EINVAL; @@ -184,7 +184,7 @@ int unmarshal_new_string(IOStream *io, char **s, uint32_t *s_n){ int err = 0, val_n = 0; char *val = NULL; //dprintf(">\n"); - err = unmarshal_uint32(io, &val_n); + err = unmarshal_uint32(io, (unsigned int *)&val_n); if(err) goto exit; val = allocate(val_n + 1); if(!val){ diff --git a/tools/xfrd/xdr.c b/tools/xfrd/xdr.c index 61dbe44ed6..c4af04b975 100644 --- a/tools/xfrd/xdr.c +++ b/tools/xfrd/xdr.c @@ -283,7 +283,7 @@ int unpack_sxpr(IOStream *io, Sxpr *x){ err = unpack_cons(io, &val); break; case T_BOOL: - err = unpack_bool(io, &u); + err = unpack_bool(io, (int *)&u); if(err) goto exit; val = (u ? OTRUE : OFALSE); break; diff --git a/tools/xfrd/xfrd.c b/tools/xfrd/xfrd.c index 656abc0bc4..c91951d8a3 100644 --- a/tools/xfrd/xfrd.c +++ b/tools/xfrd/xfrd.c @@ -481,9 +481,9 @@ int xfr_hello(Conn *conn){ err = -EINVAL; goto exit; } - err = intof(sxpr_childN(sxpr, 0, ONONE), &hello_major); + err = intof(sxpr_childN(sxpr, 0, ONONE), (int *)&hello_major); if(err) goto exit; - err = intof(sxpr_childN(sxpr, 1, ONONE), &hello_minor); + err = intof(sxpr_childN(sxpr, 1, ONONE), (int *)&hello_minor); if(err) goto exit; if(hello_major != major || hello_minor != minor){ eprintf("> Wanted protocol version %d.%d, got %d.%d", @@ -646,7 +646,7 @@ int xfr_send_state(XfrState *state, Conn *xend, Conn *peer){ if(!err) err = errcode; } else if(sxpr_elementp(sxpr, oxfr_xfr_ok)){ // Ok - get the new domain id. - err = intof(sxpr_childN(sxpr, 0, ONONE), &state->vmid_new); + err = intof(sxpr_childN(sxpr, 0, ONONE), (int *)&state->vmid_new); xfr_error(peer, err); } else { // Anything else is invalid. But it may be too late. @@ -917,7 +917,7 @@ int xfrd_service(Args *args, int peersock, struct sockaddr_in peer_in){ int n = 0; dprintf("> xfr.migrate\n"); - err = intof(sxpr_childN(sxpr, n++, ONONE), &state->vmid); + err = intof(sxpr_childN(sxpr, n++, ONONE), (int *)&state->vmid); if(err) goto exit; err = stringof(sxpr_childN(sxpr, n++, ONONE), &state->vmconfig); if(err) goto exit; @@ -939,7 +939,7 @@ int xfrd_service(Args *args, int peersock, struct sockaddr_in peer_in){ int n = 0; dprintf("> xfr.save\n"); - err = intof(sxpr_childN(sxpr, n++, ONONE), &state->vmid); + err = intof(sxpr_childN(sxpr, n++, ONONE), (int *)&state->vmid); if(err) goto exit; err = stringof(sxpr_childN(sxpr, n++, ONONE), &state->vmconfig); if(err) goto exit; @@ -965,7 +965,7 @@ int xfrd_service(Args *args, int peersock, struct sockaddr_in peer_in){ int n = 0; dprintf("> xfr.xfr\n"); - err = intof(sxpr_childN(sxpr, n++, ONONE), &state->vmid); + err = intof(sxpr_childN(sxpr, n++, ONONE), (int *)&state->vmid); if(err) goto exit; err = xfr_recv(args, state, conn); -- 2.30.2